From 62e468fdbc778be43377fcf8ac88e655b563beb7 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 19 Dec 2022 15:54:55 +0100 Subject: [PATCH] Ifdef all mentions of navigationpanehelper out of non-Windows builds Signed-off-by: Claudio Cambra --- src/gui/accountsettings.cpp | 6 ++++++ src/gui/accountsetupfromcommandlinejob.cpp | 2 ++ src/gui/folderman.h | 3 +++ src/gui/generalsettings.cpp | 3 +++ src/gui/owncloudsetupwizard.cpp | 6 +++++- 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 65b8b7bad..551d60450 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -839,9 +839,11 @@ void AccountSettings::slotFolderWizardAccepted() */ definition.ignoreHiddenFiles = folderMan->ignoreHiddenFiles(); +#ifdef Q_OS_WIN if (folderMan->navigationPaneHelper().showInExplorerNavigationPane()) { definition.navigationPaneClsid = QUuid::createUuid(); } +#endif const auto selectiveSyncBlackList = folderWizard->property("selectiveSyncBlackList").toStringList(); @@ -937,8 +939,10 @@ void AccountSettings::slotEnableVfsCurrentFolder() return; } +#ifdef Q_OS_WIN // we might need to add or remove the panel entry as cfapi brings this feature out of the box FolderMan::instance()->navigationPaneHelper().scheduleUpdateCloudStorageRegistry(); +#endif // It is unsafe to switch on vfs while a sync is running - wait if necessary. const auto connection = std::make_shared(); @@ -1014,8 +1018,10 @@ void AccountSettings::slotDisableVfsCurrentFolder() return; } +#ifdef Q_OS_WIN // we might need to add or remove the panel entry as cfapi brings this feature out of the box FolderMan::instance()->navigationPaneHelper().scheduleUpdateCloudStorageRegistry(); +#endif // It is unsafe to switch off vfs while a sync is running - wait if necessary. const auto connection = std::make_shared(); diff --git a/src/gui/accountsetupfromcommandlinejob.cpp b/src/gui/accountsetupfromcommandlinejob.cpp index eeff0cfb0..dd0f4066f 100644 --- a/src/gui/accountsetupfromcommandlinejob.cpp +++ b/src/gui/accountsetupfromcommandlinejob.cpp @@ -176,9 +176,11 @@ void AccountSetupFromCommandLineJob::setupLocalSyncFolder(AccountState *accountS definition.ignoreHiddenFiles = folderMan->ignoreHiddenFiles(); definition.alias = folderMan->map().size() > 0 ? QString::number(folderMan->map().size()) : QString::number(0); +#ifdef Q_OS_WIN if (folderMan->navigationPaneHelper().showInExplorerNavigationPane()) { definition.navigationPaneClsid = QUuid::createUuid(); } +#endif folderMan->setSyncEnabled(false); diff --git a/src/gui/folderman.h b/src/gui/folderman.h index 8bb71b732..b76ede8da 100644 --- a/src/gui/folderman.h +++ b/src/gui/folderman.h @@ -149,7 +149,10 @@ public: static QString unescapeAlias(const QString &); SocketApi *socketApi(); + +#ifdef Q_OS_WIN NavigationPaneHelper &navigationPaneHelper() { return _navigationPaneHelper; } +#endif /** * Check if @a path is a valid path for a new folder considering the already sync'ed items. diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index bc5c5fbda..d9d0b5d2c 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -580,8 +580,11 @@ void GeneralSettings::slotShowInExplorerNavigationPane(bool checked) { ConfigFile cfgFile; cfgFile.setShowInExplorerNavigationPane(checked); + +#ifdef Q_OS_WIN // Now update the registry with the change. FolderMan::instance()->navigationPaneHelper().setShowInExplorerNavigationPane(checked); +#endif } void GeneralSettings::slotIgnoreFilesEditor() diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index 633d8f6b7..50a5fce6c 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -722,8 +722,12 @@ void OwncloudSetupWizard::slotAssistantFinished(int result) folderDefinition.virtualFilesMode = bestAvailableVfsMode(); } #endif - if (folderMan->navigationPaneHelper().showInExplorerNavigationPane()) + +#ifdef Q_OS_WIN + if (folderMan->navigationPaneHelper().showInExplorerNavigationPane()) { folderDefinition.navigationPaneClsid = QUuid::createUuid(); + } +#endif auto f = folderMan->addFolder(account, folderDefinition); if (f) { -- 2.30.2